From e9527ff07c8fb22fa818c263f45de27a9f303f65 Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Mon, 22 Sep 2014 12:52:41 -0400
Subject: [PATCH] move to new interface

---
 src/cargo/core/package_id.rs | 8 ++++----
 src/cargo/util/toml.rs       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cargo/core/package_id.rs b/src/cargo/core/package_id.rs
index 8070d7c3a..49ee9abc0 100644
--- a/src/cargo/core/package_id.rs
+++ b/src/cargo/core/package_id.rs
@@ -24,9 +24,9 @@ impl ToVersion for semver::Version {
 
 impl<'a> ToVersion for &'a str {
     fn to_version(self) -> Result<semver::Version, String> {
-        match semver::parse(self) {
-            Some(v) => Ok(v),
-            None => Err(format!("cannot parse '{}' as a semver", self)),
+        match semver::Version::parse(self) {
+            Ok(v) => Ok(v),
+            Err(_) => Err(format!("cannot parse '{}' as a semver", self)),
         }
     }
 }
@@ -53,7 +53,7 @@ impl<E, D: Decoder<E>> Decodable<D, E> for PackageId {
         let captures = regex.captures(string.as_slice()).expect("invalid serialized PackageId");
 
         let name = captures.at(1);
-        let version = semver::parse(captures.at(2)).expect("invalid version");
+        let version = semver::Version::parse(captures.at(2)).ok().expect("invalid version");
         let source_id = SourceId::from_url(captures.at(3).to_string());
 
         Ok(PackageId {
diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index d0723b371..0d8deaf52 100644
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -262,9 +262,9 @@ pub struct TomlVersion {
 impl<E, D: Decoder<E>> Decodable<D, E> for TomlVersion {
     fn decode(d: &mut D) -> Result<TomlVersion, E> {
         let s = raw_try!(d.read_str());
-        match semver::parse(s.as_slice()) {
-            Some(s) => Ok(TomlVersion { version: s }),
-            None => Err(d.error(format!("cannot parse '{}' as a semver",
+        match semver::Version::parse(s.as_slice()) {
+            Ok(s) => Ok(TomlVersion { version: s }),
+            Err(_) => Err(d.error(format!("cannot parse '{}' as a semver",
                                         s).as_slice())),
         }
     }
-- 
2.30.2